From 9a31bfac1983d4c494d205324d9625fc015c65d6 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 1 Feb 2013 18:26:52 +0000
Subject: [PATCH] Update mkicondoc.

---
 gpsbabel/mkicondoc.cc | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/gpsbabel/mkicondoc.cc b/gpsbabel/mkicondoc.cc
index 75557ee29..7032c03df 100644
--- a/gpsbabel/mkicondoc.cc
+++ b/gpsbabel/mkicondoc.cc
@@ -1,14 +1,19 @@
+// Display all the Garmin icons that we know about so we can copy/paste
+// into our doc, http://www.gpsbabel.org/htmldoc-development/GarminIcons.html
+
+
 #include <stdarg.h>
 #include <stdio.h>
-#include "fatal.c"
-#include "util.c"
-#include "cet.c"
-#define VERSION "1"
-#include "globals.c"
+#include "fatal.cc"
+#include "util.cc"
+#include "cet.cc"
+// #define VERSION "1"
+#include "globals.cc"
+#include "jeeps/gpsmath.cc"
 
 
 
-tbl_ent(int n, ...)
+void tbl_ent(int n, ...)
 {
   int i;
   char* t;
@@ -30,15 +35,15 @@ tbl_ent(int n, ...)
 
 }
 
-#include "garmin_tables.c"
-sort_garmin(const void* a, const void* b)
+#include "garmin_tables.cc"
+int sort_garmin(const void* a, const void* b)
 {
-  const icon_mapping_t* ap = a;
-  const icon_mapping_t* bp = b;
+  const icon_mapping_t* ap = (const icon_mapping_t*) a;
+  const icon_mapping_t* bp = (const icon_mapping_t*) b;
   return (case_ignore_strcmp((ap)->icon, (bp)->icon));
 }
 
-garmin()
+void garmin()
 {
   icon_mapping_t* i;
   int n = 0;
@@ -61,7 +66,8 @@ garmin()
   }
 }
 
-main()
+int main()
 {
   garmin();
+  return 0;
 }
-- 
2.30.2